From 72f709a8641298e739c4f36c4d27ce18ed916498 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 21 Nov 2005 15:00:57 +0000 Subject: [PATCH] Merge remaining fixes from the 2.8 branch, pointed out by Michael 2005-11-21 Matthias Clasen * gtk/gtkpathbar.c: Merge remaining fixes from the 2.8 branch, pointed out by Michael Natterer. --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gtk/gtkpathbar.c | 16 +++++++++++----- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c48f1762a..43cedd5547 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-11-21 Matthias Clasen + * gtk/gtkpathbar.c: Merge remaining fixes from the 2.8 branch, + pointed out by Michael Natterer. + Fix for bug #321542, Benedikt Meurer: * gtk/gtkcombobox.c (gtk_combo_box_set_active_internal): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5c48f1762a..43cedd5547 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-11-21 Matthias Clasen + * gtk/gtkpathbar.c: Merge remaining fixes from the 2.8 branch, + pointed out by Michael Natterer. + Fix for bug #321542, Benedikt Meurer: * gtk/gtkcombobox.c (gtk_combo_box_set_active_internal): diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index 5a8740bc0a..ce13d70169 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -125,7 +125,7 @@ get_slider_button (GtkPathBar *path_bar, gtk_widget_push_composite_child (); button = gtk_button_new (); - gtk_button_set_focus_on_click (button, FALSE); + gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE); gtk_container_add (GTK_CONTAINER (button), gtk_arrow_new (arrow_type, GTK_SHADOW_OUT)); gtk_container_add (GTK_CONTAINER (path_bar), button); gtk_widget_show_all (button); @@ -307,13 +307,19 @@ gtk_path_bar_update_slider_buttons (GtkPathBar *path_bar) button = BUTTON_DATA (path_bar->button_list->data)->button; if (gtk_widget_get_child_visible (button)) - gtk_widget_set_sensitive (path_bar->down_slider_button, FALSE); + { + gtk_path_bar_stop_scrolling (path_bar); + gtk_widget_set_sensitive (path_bar->down_slider_button, FALSE); + } else gtk_widget_set_sensitive (path_bar->down_slider_button, TRUE); button = BUTTON_DATA (g_list_last (path_bar->button_list)->data)->button; if (gtk_widget_get_child_visible (button)) - gtk_widget_set_sensitive (path_bar->up_slider_button, FALSE); + { + gtk_path_bar_stop_scrolling (path_bar); + gtk_widget_set_sensitive (path_bar->up_slider_button, FALSE); + } else gtk_widget_set_sensitive (path_bar->up_slider_button, TRUE); } @@ -1134,7 +1140,7 @@ button_drag_data_get_cb (GtkWidget *widget, gtk_selection_data_set (selection_data, selection_data->target, 8, - uri_list, + (guchar *)uri_list, strlen (uri_list)); g_free (uri_list); } @@ -1160,7 +1166,7 @@ make_directory_button (GtkPathBar *path_bar, button_data->type = find_button_type (path_bar, path); button_data->button = gtk_toggle_button_new (); - gtk_button_set_focus_on_click (button_data->button, FALSE); + gtk_button_set_focus_on_click (GTK_BUTTON (button_data->button), FALSE); switch (button_data->type) { -- 2.30.2